Merge branch 'master' into develop

Conflicts:
	README.org
	which-key.el

diff --cc README.org
index c1ca7558c0be64716e358347e2dd9605fc4dad15,810deff70cb675778f1659ead5a8f7798a2351c5..01dac738f8657eac7dd81e2e66834574fd2e8c44
--- 1/README.org
--- 2/README.org
+++ b/README.org
@@@ -1,5 -1,5 +1,10 @@@
++<<<<<<< HEAD
 +[[http://melpa.org/packages/which-key-badge.svg]]
 +* which-key 
++=======
+ * which-key 
+ [[http://melpa.org/#/which-key][http://melpa.org/packages/which-key-badge.svg]]
++>>>>>>> master
  ** Introduction
  This is a rewrite of [[https://github.com/kai2nenobu/guide-key][guide-key-mode]] for emacs. The intention is to provide the
  following features:

diff --cc which-key.el
Simple merge